Fix a few dubious return values in return_if_fail calls

These were pointed out in bug 623958.

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 522c5173b9bc1d2c90a6c41cb2cbe0c2e94689d5..b491a1403f276dced1486b336480d32d48de5103 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -5995,9 +5995,9 @@ gtk_icon_view_get_item_row (GtkIconView *icon_view,
 {
   GtkIconViewItem *item;
 
-  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), FALSE);
-  g_return_val_if_fail (icon_view->priv->model != NULL, FALSE);
-  g_return_val_if_fail (path != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+  g_return_val_if_fail (icon_view->priv->model != NULL, -1);
+  g_return_val_if_fail (path != NULL, -1);
 
   item = g_list_nth_data (icon_view->priv->items,
                           gtk_tree_path_get_indices(path)[0]);
@@ -6026,9 +6026,9 @@ gtk_icon_view_get_item_column (GtkIconView *icon_view,
 {
   GtkIconViewItem *item;
 
-  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), FALSE);
-  g_return_val_if_fail (icon_view->priv->model != NULL, FALSE);
-  g_return_val_if_fail (path != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
+  g_return_val_if_fail (icon_view->priv->model != NULL, -1);
+  g_return_val_if_fail (path != NULL, -1);
 
   item = g_list_nth_data (icon_view->priv->items,
                           gtk_tree_path_get_indices(path)[0]);

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 9aee0f1fd0efe3549d7b62d7bb4d1b9e2a455806..978d2db45433d7feb018d0807078da8cdd36aaf1 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1819,7 +1819,7 @@ _gtk_menu_shell_get_grab_device (GtkMenuShell  *menu_shell)
 {
   GtkMenuShellPrivate *priv;
 
-  g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), FALSE);
+  g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), NULL);
 
   priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);